projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: daaf7e1) | patch
merge: Support --json and --json-error-messages and --json-progress
authorJoey Hess <joeyh@joeyh.name>
Wed, 10 May 2023 16:32:00 +0000 (12:32 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 10 May 2023 16:34:19 +0000 (12:34 -0400)
commitc98fb0b637dcb26155fcc6ddbcf3322c5bac0b8c
treef13d3d9269acd95a9dc50944817de8e83c4a48e3tree | snapshot
parentdaaf7e10be6e2cebe1f1481743571bd739ffa309commit | diff
merge: Support --json and --json-error-messages and --json-progress

Seems unlikely to be very useful, but trivial.
And, this completes the story that git-annex sync does not need json,
since every sub-operation is available in a command that does support json.
(Well, except for committing, but that's not a git-annex command.)

Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project
CHANGELOG diff | blob | history
Command/Merge.hs diff | blob | history
doc/git-annex-merge.mdwn diff | blob | history
doc/todo/--json_for_unannex__and_ideally_any_other_command_.mdwn diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.